== MergetoolWindowTitle == Unity Version Control λ³ν© ν΄ == FirstConflictButtonTooltip == 첫 λ²μ§Έ μΆ©λλ‘ μ΄λ(Ctrl + Shift + -) == PrevConflictButtonTooltip == μ΄μ μΆ©λ(Ctrl + -) == NextConflictButtonTooltip == λ€μ μΆ©λ(Ctrl + +) == LastConflictButtonTooltip == λ§μ§λ§ μΆ©λλ‘ μ΄λ(Ctrl + Shift + +) == PrevNotAutomaticConflictButtonTooltip == μ΄μ λΉμλ μΆ©λ(Ctrl + PageUp) == NextNotAutomaticConflictButtonTooltip == λ€μ λΉμλ μΆ©λ(Ctrl + PageDown) == PendingAutomaticConflictsLabel == νμ¬ μΆ©λ: {0}/{1} == PendingNonAutomaticConflictsLabel == λκΈ° μ€μΈ λ―Έν΄κ²°: {0}/{1} == NonAutomaticConflictsLabelTooltip == νμ¬ λ―Έν΄κ²°μΈ λΉμλ μΆ©λ == CurrentConflictLabelTooltip == νμ¬ λ³ν© μΆ©λ == NonAutomaticConflictsNavigationTooltip == νμ¬ λ―Έν΄κ²°μΈ μΆ©λλ‘ μ΄λ == AutomaticConflictsNavigationTooltip == λ³ν© μΆ©λλ‘ μ΄λ == AutomaticConflictMarkup == νμ¬ μΆ©λμ <span foreground='green'>μλ</span>μ λλ€. μ¬μ©μ κ°μ μ΄ νμνμ§ μμ΅λλ€. == NonAutomaticConflictMarkup == νμ¬ μΆ©λμ <span foreground='red'>λΉμλ</span>μ λλ€. μμ λ²νΌμ ν΄λ¦νκ±°λ κ²°κ³Ό νμΌμ νΈμ§νκ±°λ ν΄κ²°λ¨μΌλ‘ νμνμ¬ ν΄κ²°νμμμ€. == NonAutomaticConflictMarkedAsResolvedMarkup == νμ¬ μΆ©λμ <span foreground='green'>λΉμλ</span>μ΄λ©° μ¬μ©μμ μν΄ μ΄λ―Έ <span foreground='green'>ν΄κ²°</span>λμμ΅λλ€. == MarkAsResolvedButton == ν΄κ²°λ¨μΌλ‘ νμ == MarkAsUnresolvedButton == λ―Έν΄κ²°λ‘ νμ == WinMergetoolUsageTitle == Mergetool μ¬μ© == WinMergetoolUsage == μ¬μ©λ²: mergetool [<diffOptions> | <mergeOptions>] diffOptions: <generalFiles> [<generalOptions>] mergeOptions: <generalFiles> <baseFile> [<baseSymbolicName>] [[<automatic>] [<silent>] <resultFile>] [<mergeType>] [<generalOptions>] baseFile: {-b | --base}=<filename> baseSymbolicName: {-bn | --basesymbolicname}=<symbolicname> automatic: -a | --automatic silent: --silent resultFile: {-r | --result}=<filename> mergeType: {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced} generalFiles: <sourceFile> [<srcSymbolicName>] <destination> [<dstSymbolicName>] sourceFile: {-s | --source}=<filename> srcSymbolicName: {-sn | --srcsymbolicname}=<symbolicname> destinationFile: {-d | --destination}=<filename> dstSymbolicName: {-dn | --dstsymbolicname}=<symbolicname> generalOptions: [<defaultEncoding>] [<comparisonMethod>] [<fileType>] [<resultEncoding>] defaultEncoding: {-e | --encoding}={none |ascii | unicode | bigendian | utf7 | utf8} comparisonMethod: {-i | --ignore}={none | eol | whitespaces | eol&whitespaces} fileType: {-t | --filestype}={text/csharp | text/XML | text} resultEncoding: {-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8} progress: {--progress}=νμ¬ μ§νλλ₯Ό λνλ΄λ μ§νλ λ¬Έμμ΄(μ: 1/8κ° νμΌ λ³ν© μ€) extraInfoFile: {--extrainfofile}=λ³ν©μ λν μΆκ° μ 보λ₯Ό ν¬ν¨νλ νμΌμ κ²½λ‘ λΉκ³ : -a | --automatic: μλ λ³ν© ν΄κ²°μ μλν©λλ€. λ³ν©μ μλμΌλ‘ ν΄κ²°ν μ μλ κ²½μ°(μ¬μ©μ μνΈμμ© νμ) λ³ν© ν΄μ΄ νμλ©λλ€. --silent: μ΄ μ΅μ μ --automatic μ΅μ κ³Ό ν¨κ» μ¬μ©ν΄μΌ ν©λλ€. λ³ν©μ μλμΌλ‘ ν΄κ²°ν μ μλ κ²½μ° μ΄ μ΅μ μΌλ‘ μΈν΄ ν΄μμ 0μ΄ μλ μ’ λ£ μ½λλ₯Ό μ¦μ λ°νν©λλ€(λ³ν© ν΄μ΄ νμλμ§ μμ). ν΄μμ μλμΌλ‘ λ³ν©μ ν΄κ²°ν μ μλ κ²½μ° νλ‘κ·Έλ¨μμ μ’ λ£ μ½λ 0μ λ°νν©λλ€. μ: mergetool mergetool -s=file1.txt -d=file2.txt mergetool -s=file1.txt -b=file0.txt --destination=file2.txt mergetool --base=file0.txt -d=file2.txt --source=file1.txt --automatic --result=result.txt mergetool -b=file0.txt -s=file1.txt -d=file2.txt -a -r=result.txt -e=utf7 -i=eol -t=text/csharp -m=onlyone == BrowseForSaveFileTitle == νμΌ μ μ₯ == PendingUnsolvedConflicts == νμΌμ μμ§ {0}κ°μ λ―Έν΄κ²° μΆ©λμ΄ μμ΅λλ€. == FileChangedSinceSaved == νμΌμ΄ λ§μ§λ§μΌλ‘ μ μ₯λ μ΄νλ‘ λ³κ²½λμμ΅λλ€. == SaveAndExitDialogButton == μ μ₯ λ° μ’ λ£ == ExitWithoutSavingButton == μ μ₯νμ§ μκ³ μ’ λ£ == CloseButton == λ«κΈ° == OkButton == νμΈ == CancelButton == μ·¨μ == SourceHeaderButton == μμ€ μ ν: '{0}' == SourceHeaderPressedButton == μμ€ μ ν ν΄μ : '{0}' == SourceHeaderButtonTooltip == (Ctrl+1) == BaseHeaderButton == λ² μ΄μ€ μ ν: '{0}' == BaseHeaderPressedButton == λ² μ΄μ€ μ ν ν΄μ : '{0}' == BaseHeaderButtonTooltip == (Ctrl+2) == DestinationHeaderButton == λμ μ ν: '{0}' == DestinationHeaderPressedButton == λμ μ ν ν΄μ : '{0}' == DestinationHeaderButtonTooltip == (Ctrl+3) == ResultButton == κ²°κ³Ό μ ν == ResultPressedButton == κ²°κ³Ό μ ν ν΄μ == ResultButtonTooltip == (Ctrl+4) == SaveAndExitButton == μ μ₯ λ° μ’ λ£ == SaveAndExitTooltip == κ²°κ³Ό μ μ₯ λ° Mergetool λ«κΈ° == SaveAsTooltip == μ νμΌμ κ²°κ³Ό μ μ₯ == SaveButton == μ μ₯ == SaveButtonTooltip == λ³κ²½μ¬ν μ μ₯(Ctrl+S) == SaveAsMenu == λ€λ₯Έ μ΄λ¦μΌλ‘ μ μ₯... == MergeButton == λ³ν© == KeepSrcMenu == μμ€ κΈ°μ¬μ μ μ§ λ° μ’ λ£ == KeepBaseMenu == λ² μ΄μ€ κΈ°μ¬μ μ μ§ λ° μ’ λ£ == KeepDstMenu == λμ κΈ°μ¬μ μ μ§ λ° μ’ λ£ == SrcNeeded == μμ€ νμΌ μ΄λ¦μ΄ νμν©λλ€ == DstNeeded == λμ νμΌ μ΄λ¦μ΄ νμν©λλ€ == ResultNeeded == μλ λ³ν©μμλ κ²°κ³Ό νμΌ μ΄λ¦μ΄ νμν©λλ€ == AutomaticNeeded == λΉνμ λͺ¨λμμλ μλ λ³ν© μ΅μ μ΄ νμν©λλ€ == FileTypeError == {0} μ νμ ꡬ문 κ°μ‘°νμμ μ ν¨ν νμΌ μ νμ΄ μλλλ€ == CompMethodError == μλͺ»λ λΉκ΅ λ°©λ² == ArgError == μ§μ λ μΈμκ° μ ν¨νμ§ μμ΅λλ€ == SrcEncodingMenuTitle == μμ€ μΈμ½λ© == DstEncodingMenuTitle == λμ μΈμ½λ© == BaseEncodingMenuTitle == λ² μ΄μ€ μΈμ½λ© == ResultEncodingMenuTitle == κ²°κ³Ό μΈμ½λ© == SplitBlocksMenuTitle == μΆ©λ λΈλ‘ λΆν == ComparisonMethodMenuTitle == λΉκ΅ λ°©λ² == RecognizeAll == λͺ¨λ μΈμ == IgnoreEol == EOL 무μ == IgnoreWhitespace == 곡백 무μ == IgnoreEolWhitespace == EOL λ° κ³΅λ°± 무μ == EncodingDialogTitle == μΈμ½λ© μ ν == EncodingDialogDescription == λ¬Έμ μΈμ½λ© μ ν == EncodingDialogLabel == μΈμ½λ©: == DefaultEncoding == κΈ°λ³Έ μΈμ½λ©: == ResultEncoding == κ²°κ³Ό μΈμ½λ©: == NoneEncoding == μμ == AsciiEncoding == ASCII == UnicodeEncoding == Unicode == UnicodeBigEndianEncoding == Unicode Big-Endian == Utf8Encoding == UTF-8 == OtherEncoding == κΈ°ν... == ChangeEncoding == λ³κ²½... == Options == μ΅μ == FindButton == μ°ΎκΈ°... == MatchCase == λμλ¬Έμ μΌμΉ == MergeResolutionOptionsTooltip == λ³ν© ν΄κ²° μ΅μ == MergeOptionsTooltip == νμ λ° κ³μ° μ΅μ == SyntaxHighlight == ꡬ문 κ°μ‘°νμ == FirstDiffButtonTooltip == 첫 λ²μ§Έ μ°¨μ΄μ == PrevDiffButtonTooltip == μ΄μ μ°¨μ΄μ == NextDiffButtonTooltip == λ€μ μ°¨μ΄μ == LastDiffButtonTooltip == λ§μ§λ§ μ°¨μ΄μ == FirstDiffButtonTooltipWithShortcut == 첫 λ²μ§Έ μ°¨μ΄μ (Ctrl + Shift + n) == PrevDiffButtonTooltipWithShortcut == μ΄μ μ°¨μ΄μ (Ctrl + n) == NextDiffButtonTooltipWithShortcut == λ€μ μ°¨μ΄μ (Ctrl + m) == LastDiffButtonTooltipWithShortcut == λ§μ§λ§ μ°¨μ΄μ (Ctrl + Shift + m) == CurrentDifference == νμ¬: {0}/{1} == LeftEncoding == μΌμͺ½ μΈμ½λ© == RightEncoding == μ€λ₯Έμͺ½ μΈμ½λ© == DifferencesWindowTitle == μ°¨μ΄μ == AutomaticConflictChunk1 == νμ¬ μΆ©λμ == AutomaticConflictChunk2 == μλμ λλ€ == AutomaticConflictChunk3 == . μ¬μ©μ κ°μ μ΄ νμνμ§ μμ΅λλ€. == SolvedConflictChunk1 == νμ¬ μΆ©λμ == SolvedConflictChunk2 == λΉμλμ΄λ©° == SolvedConflictChunk3 == μ¬μ©μμ μν΄ == SolvedConflictChunk4 == μ΄λ―Έ == SolvedConflictChunk5 == ν΄κ²°λμμ΅λλ€. == NonAutomaticConflictChunk1 == νμ¬ μΆ©λμ == NonAutomaticConflictChunk2 == λΉμλμ λλ€ == NonAutomaticConflictChunk3 == . μμ λ²νΌμ ν΄λ¦νκ±°λ κ²°κ³Ό νμΌμ νΈμ§νκ±°λ ν΄κ²°λ¨μΌλ‘ νμνμ¬ ν΄κ²°νμμμ€. == PatternNotFound == ν¨ν΄μ μ°Ύμ μ μμ΅λλ€ == PreviousSearchButtonTooltip == μ΄μ μΌμΉ κ²μ == NextSearchButtonTooltip == λ€μ μΌμΉ κ²μ == UnexpectedError == μμμΉ λͺ»ν μ€λ₯κ° λ°μνμ΅λλ€. == GoToLineMenuItem == νμΌλ‘ μ΄λ... == AddDiffSelectionMenuItem == λΉκ΅ μ νμ¬ν μΆκ° == DiffWithPreviousSelectionMenuItem == μ΄μ μ νμ¬νκ³Ό λΉκ΅ == FindMenuItem == μ°ΎκΈ°... == FindNextMenuItem == λ€μ μ°ΎκΈ° == FirstSelection == 첫 λ²μ§Έ μ νμ¬ν == SecondSelection == λ λ²μ§Έ μ νμ¬ν == SemanticDiffMovedCode == μ΄λν μ½λ λΉκ΅... == SemanticGoToMovedCode == μ΄λν μ½λλ‘ μ΄λ == SemanticDiffChangedCode == λ³κ²½λ μ½λ λΉκ΅... == SyncMovedCode == μμλ‘ μ΄λν μ½λ λκΈ°ν == UnsyncMovedCode == μ€ν¬λ‘€ μμΉ λ³΅μ == OutliningMenu == μΈκ³½μ μ²λ¦¬ == CollapseRegionsWithoutDiffsMenu == μ°¨μ΄μ μλ μμ μ κΈ° == CollapseToDefinitionsMenu == μ μκΉμ§ μ κΈ° == ExpandAllMenu == λͺ¨λ νΌμΉκΈ° == Merged == λ³ν©λ¨ == LoadingAnnotations == μ£Όμ λ‘λ μ€... == AnnotateLineInfoChangeset == 체μΈμ§ μΈνΈ == AnnotateLineInfoTimeStamp == μμ±μΌ == AnnotateLineInfoOwner == μμ μ == AnnotateLineInfoComments == μ½λ©νΈ == AnnotateColorByAuthor == μμ±μλ³ μμ == AnnotateColorByDate == λ μ§λ³ μμ == AnnotateContextMenu == μ£Όμ == AnnotateShowAuthor == μμ±μ νμ == AnnotateShowBranch == λΈλμΉ νμ == AnnotateShowChangeInMerge == λ³ν© μ ν λ³κ²½ μ¬λΆ νμ == AnnotateShowChangeset == 체μΈμ§ μΈνΈ νμ == AnnotateShowDateModified == μμ λ λ μ§ νμ == AnnotateShowLineAge == ν μλͺ νμ == BigFileMessage == νμΌμ΄ μλΉν ν½λλ€. μ°¨μ΄μ κ³μ°μ μκ°μ΄ 걸릴 μ μμ΅λλ€. μ΄ νμΌμ μ°¨μ΄μ μ κ³μ°νλ €λ©΄ λ²νΌμ ν΄λ¦νμμμ€. == CalculateDifferencesButton == μ°¨μ΄μ κ³μ° == BranchChanges == λΈλμΉ λ³κ²½μ¬ν == BranchChangesTooltip == λΈλμΉ λ³κ²½μ¬ν κ°μ‘°νμ == ConflictChanges == μΆ©λ λ³κ²½μ¬ν == ConflictChangesTooltip == λ³ν©νλ λμ μ¬μ©μκ° ν΄κ²°ν μΆ©λμ΄ μλ λ³κ²½μ¬ν κ°μ‘°νμ == MergedChanges == λ³ν©λ λ³κ²½μ¬ν == MergedChangesTooltip == λ³ν©μΌλ‘ μΈν λ³κ²½μ¬ν κ°μ‘°νμ == CaseSensitiveCheckBox == λμλ¬Έμ μΌμΉ == ColorsConfigurationMenuItem == ν°νΈ λ° μμ ꡬμ±... == ComparisonMethodMenuItem == λΉκ΅ λ°©λ² == ComparisonMethodIgnoreEolMenuItem == EOL 무μ == ComparisonMethodIgnoreWhitespacesMenuItem == 곡백 무μ == ComparisonMethodIgnoreEolWhitespacesMenuItem == EOL λ° κ³΅λ°± 무μ == ComparisonMethodRecognizeAllMenuItem == λͺ¨λ μΈμ == Content == {0}μ μ½ν μΈ == CopyToClipboard == ν΄λ¦½λ³΄λλ‘ λ³΅μ¬ == DiffWaitingAnimation == μ°¨μ΄μ κ³μ° μ€... == DiscardButton == νκΈ° == DiscardButtonTooltip == λ³κ²½μ¬ν νκΈ° == EditorOptions == νΈμ§κΈ° μ΅μ == EditorOptionsConvertTabsToSpaces == νΈμ§ μ€μ νμ 곡백μΌλ‘ λ³ν == EditorOptionsWhistespaces == 곡백 보기 == EditorOptionsTabs == ν == EditorOptionsTabsSpacesNumber == 곡백 {0}κ° == EditorOptionsColumnGuides == μ΄ μλ΄μ == EditorOptionsColumnsNumber == μ΄ {0}κ° == EditorOptionsBorderLines == μ ννμ§ μμ μμμ κ²½κ³μ 보기 == EncodingDifferences == {0}μμ {1}(μΌ)λ‘ μΈμ½λ©μ΄ λ³κ²½λμμ΅λλ€. == FsProtectionDifferences == νμΌ μμ€ν κΆνμ΄ {0}μμ {1}(μΌ)λ‘ λ³κ²½λ¨ == UnableCalculateDiffs == μ°¨μ΄μ μ κ³μ°ν μ μμ΅λλ€. == HideUnchanged == λ³κ²½λμ§ μμ μ¬ν μ¨κΈ°κΈ° == HideUnchangedTooltip == λ³κ²½λ μ μΈλ§ νμ == ShowUnchanged == λ³κ²½λμ§ μμ μ¬ν νμ == ShowUnchangedTooltip == μ 체 νμΌ νΈλ¦¬λ₯Ό νμνλ―λ‘ λͺ¨λ μ μΈμ νμΈν μ μμ == GroupUnchanged == λ³κ²½λμ§ μμ μ¬ν κ·Έλ£Ήν == GroupUnchangedTooltip == λ³κ²½λ μ μΈμ νμνκ³ λλ¨Έμ§ μ μΈμ λ¨μΌ λ―Έλ³κ²½ κ·Έλ£ΉμΌλ‘ κ΅¬μ± == ZoomIn == νλ == ZoomInTooltip == κ·Έλ¦Ό νλ - Ctrl ν€λ₯Ό λλ₯Έ μ±λ‘ μ€ν¬λ‘€ ν μ μ¬μ©ν΄λ λ¨ == ZoomOut == μΆμ == ZoomOutTooltip == κ·Έλ¦Ό μΆμ - Ctrl ν€λ₯Ό λλ₯Έ μ±λ‘ μ€ν¬λ‘€ ν μ μ¬μ©ν΄λ λ¨ == ErrorSavingFile == νμΌμ μ μ₯νλ μ€μ μ€λ₯κ° λ°μνμ΅λλ€: {0} == Find == μ°ΎκΈ°: == FindCloseButtonTooltip == κ²μ λ° λ«κΈ° == FindPreviousButtonTooltip == μ΄μ μΌμΉ κ²μ == FindNextButtonTooltip == λ€μ μΌμΉ κ²μ == MovedDetectionMenuItem == μ΄λ κ°μ§ == MovedDetectionDialogMenuItem == μ΄λ κ°μ§... == EnableMoveDetectionMenuItem == μ΄λ κ°μ§ νμ±ν == MoveDetectionRatio == μ΄λ κ°μ§ λΉμ¨ == MinimumLinesInDifference == μ°¨μ΄μ μ μ΅μ ν μ == MaximizeButtonLeftTooltip == μΌμͺ½ ν¨λ μ΅λν == MaximizeButtonRightTooltip == μ€λ₯Έμͺ½ ν¨λ μ΅λν == RestoreButtonLeftTooltip == μΌμͺ½ ν¨λ 볡μ == RestoreButtonRightTooltip == μ€λ₯Έμͺ½ ν¨λ 볡μ == OutliningPreferencesTitle == μΈκ³½μ μ²λ¦¬ κΈ°λ³Έ μ€μ == OutliningPreferencesCaption == μΈκ³½μ μ²λ¦¬ κΈ°λ³Έ μ€μ == OutliningPreferencesDetails == νμΌ λ‘λ μ μ νΈνλ μΈκ³½μ μ²λ¦¬ λͺ¨λλ₯Ό μ ν == OutliningPreferencesExplanation == νμΌ λ‘λ ν λ€μ μΈκ³½μ μ²λ¦¬ λͺ¨λ μ¬μ©: == OutliningPreferencesCollapseWithoutDiffs == μ°¨μ΄μ μλ μμ μ κΈ° == OutliningPreferencesCollapseToDefinitions == μ μκΉμ§ μ κΈ° == OutliningPreferencesExpandAll == λͺ¨λ νΌμΉκΈ° == NavigationTooltip == μ΄λν λ¨νΈμΌλ‘ μ΄λ == XDiffTooltip == μ΄λν λ¨νΈμ μ°¨μ΄μ μ λλν νμ == XDiffFragment == [λ¨νΈ] == FontsAndColorsMenuItem == ν°νΈ λ° μμ == FontDoesNotSupportStrikeout == {0} ν°νΈλ μ ν리μΌμ΄μ μμ μ¬μ©νλ μ·¨μμ μ€νμΌμ μ§μνμ§ μμ΅λλ€. λ€λ₯Έ ν°νΈλ₯Ό μ ννμμμ€. == ChangeFontMenuItem == ν°νΈ λ³κ²½... == LeftDiffColorMenuItem == μΌμͺ½ μ°¨μ΄μ μμ == RightDiffColorMenuItem == μ€λ₯Έμͺ½ μ°¨μ΄μ μμ == RestoreDefaultsMenuItem == κΈ°λ³Έκ° λ³΅μ == FilesIdentical == νμΌμ΄ λμΌν©λλ€. == AddDiffSelection == λΉκ΅ μ νμ¬ν μΆκ° == DiffWithPreviousSelection == μ΄μ μ νμ¬νκ³Ό λΉκ΅ == DiffSourceWithBase == λ² μ΄μ€ λ° μμ€ κΈ°μ¬μ λΉκ΅ == DiffDestinationWithBase == λ² μ΄μ€ λ° λμ κΈ°μ¬μ λΉκ΅ == DiffDestinationWithSource == μμ€ λ° λμ κΈ°μ¬μ λΉκ΅ == Encoding == μΈμ½λ© == FontMenuItem == ν°νΈ == DuplicatedArg == μΈμ {0}μ΄(κ°) μ€λ³΅λ©λλ€. == MergeTypeError == {0}μ(λ) μ ν¨ν λ³ν© ν΄κ²° μ νμ΄ μλλλ€ == MergeExplanation == μ΄ μ΅μ μ λ² μ΄μ€, μμ€, λμ νμΌμ ν¬ν¨νλ 3λ¨κ³ λ³ν© ν΄μ μ€νν©λλ€. μ΄λ λ€λ₯Έ νμΌμ κ²°κ³Όλ₯Ό μ μ₯ν μ μμ΅λλ€. == DifferencesExplanation == μ΄ μ΅μ μ μκ°μ μΈ ν μ€νΈ νμΌ λΉκ΅ ν΄μ μ€νν©λλ€. νμΌ κ°μ ν μ€νΈ μ°¨μ΄μ μ νμΈνλ €λ©΄ λ νμΌμ μ ννμμμ€. == XMergeNoChanges == Xmerge κ²°κ³Όκ° λΉμ΄ μμ΅λλ€. λ³κ²½μ¬νμ΄ μ€νλμ§ μμ΅λλ€. == XMergeConfirmationMessage == Xmerge κ²°κ³Όκ° μ νμ¬νμ λ체νλ©° λΉμλ μΆ©λμ΄ μ κ±°λ©λλ€. κ³μνμκ² μ΅λκΉ? == SourceDesc == μμ€(λ³ν©ν μ½λ) == SourceLoc == μμ€μμ == DestinationDesc == λμ(μμ 볡μ¬λ³Έ) == DestinationLoc == λμμμ == HowXMergeFormat == λ³ν© μΆ©λμ΄ μμ§λ§ {0}μ΄(κ°) λ μ΄μ ν΄λΉ μμΉμ μμ΅λλ€. μ΄λ¬ν κ²½μ°λΌλ©΄ μ΄λ€ κ°λ°μκ° μ½λ μ‘°κ°({1})μ μ΄λνκ³ λ€λ₯Έ κ°λ°μκ° μλ μμΉμ ν΄λΉ μ½λ μ‘°κ°({2})μ μμ νμ κ°λ₯μ±μ΄ λμ΅λλ€. == UnauthorizedAccessFile == κΆνμ΄ μμΌλ―λ‘ '{0}' νμΌμ μ μ₯ν μ μμ΅λλ€. λ€λ₯Έ κ²½λ‘μ νμΌμ μ μ₯ν μ μμ΅λλ€. == AutomaticConflictMarkup1 == νμ¬ μΆ©λμ == AutomaticConflictMarkup2 == μλμ λλ€ == AutomaticConflictMarkup3 == . μ¬μ©μ κ°μ μ΄ νμνμ§ μμ΅λλ€. == SolvedConflictMarkup1 == νμ¬ μΆ©λμ == SolvedConflictMarkup2 == λΉμλμ΄λ©° == SolvedConflictMarkup3 == μ¬μ©μμ μν΄ == SolvedConflictMarkup4 == μ΄λ―Έ == SolvedConflictMarkup5 == ν΄κ²°λμμ΅λλ€. == NonAutomaticConflictMarkup1 == νμ¬ μΆ©λμ == NonAutomaticConflictMarkup2 == λΉμλμ λλ€ == NonAutomaticConflictMarkup3 == . μμ λ²νΌμ ν΄λ¦νκ±°λ κ²°κ³Ό νμΌμ νΈμ§νκ±°λ ν΄κ²°λ¨μΌλ‘ νμνμ¬ ν΄κ²°νμμμ€. == MarkAsResolvedExplanation == μλ 3κ° λ²νΌμ μ¬μ©ν΄ κ²°κ³Ό νμΌλ‘ μ΄λν κΈ°μ¬μ(μμ€, λ² μ΄μ€ λλ λμ)λ₯Ό μ ννμμμ€. μλλ©΄ μ μλ κ²°κ³Όκ° μ΄λ―Έ λ°λμ§ν κ²½μ° \"ν΄κ²°λ¨μΌλ‘ νμ\"λ₯Ό ν΄λ¦νμμμ€ == MarkAsUnresolvedButton == λ―Έν΄κ²°λ‘ νμ == SourceFileName == μμ€ νμΌ: {0} == BaseFileName == λ² μ΄μ€ νμΌ: {0} == DestinationFileName == λμ νμΌ: {0} == RestoreButtonSrcTooltip == μμ€ ν¨λ 볡μ == RestoreButtonBaseTooltip == λ² μ΄μ€ ν¨λ 볡μ == RestoreButtonDstTooltip == λμ ν¨λ 볡μ == RestoreButtonResultTooltip == κ²°κ³Ό ν¨λ 볡μ == MaximizeButtonSrcTooltip == μμ€ ν¨λ μ΅λν == MaximizeButtonBaseTooltip == λ² μ΄μ€ ν¨λ μ΅λν == MaximizeButtonDstTooltip == λμ ν¨λ μ΅λν == MaximizeButtonResultTooltip == κ²°κ³Ό ν¨λ μ΅λν == PendingNonAutomatic == ν΄κ²° λκΈ° μ€: {0}/{1} == PreviousConflictButtonTooltip == μ΄μ μΆ©λ(Ctrl+-) == PreviousUnsolvedConflictButtonTooltip == μ΄μ λΉμλ μΆ©λ(Ctrl+PageUp) == NextUnsolvedConflictButtonTooltip == λ€μ λΉμλ μΆ©λ(Ctrl+PagDown) == OptionsButton == μ΅μ == BaseEncodingMenuItem == λ² μ΄μ€ μΈμ½λ© == SrcEncodingMenuItem == μμ€ μΈμ½λ© == DstEncodingMenuItem == λμ μΈμ½λ© == ResultEncodingMenuItem == κ²°κ³Ό μΈμ½λ© == SplitMenuItem == μΆ©λ λΈλ‘ λΆν == XmergeButton == XMerge... == XmergeButtonTooltip == XMerge λ§λ²μ¬ μ€ν == XmergeMenuItem == XMerge... == XmergeNoTextSelected == μ νλ ν μ€νΈκ° μμ΅λλ€. Xmergeλ₯Ό μ€νν μ μμ΅λλ€. == XmergeNotEnoughInfo == XMerge μ€νμ νμν μ λ³΄κ° λΆμ‘±ν©λλ€ == XmergeRemovedTextSelected == μ νλ νμ΄ μ κ±°λ©λλ€. Xmerge μ νμ¬νμΌλ‘ μ ν¨νμ§ μμ΅λλ€. == XmergeStartTip == μ΄ μ°½μμλ μ΄λ λ° μμ ν μ½λ λ¨νΈμ΄ νμλ©λλ€. μ΄λν μ½λλ {0}({1})μ μμ΅λλ€. {2}({3})μλ μμ λ μ½λκ° μ΄λνκΈ° μ μ μμ λ μ½λκ° μμ΅λλ€. λ¨μ μλ μλ μΆ©λμ ν΄κ²°νκ³ \"μ μ₯ λ° μ’ λ£\"λ₯Ό ν΄λ¦νμμμ€. == UnsolvedPendingConflicts == νμΌμ μμ§ {0}κ°μ λ―Έν΄κ²° μΆ©λμ΄ μμ΅λλ€. == ChangedFile == νμΌμ΄ λ§μ§λ§μΌλ‘ μ μ₯λ μ΄νλ‘ λ³κ²½λμμ΅λλ€. == MergeWaitingAnimation == μΆ©λ κ³μ° μ€μ λλ€. μ μ κΈ°λ€λ € μ£Όμμμ€... == SaveAsButton == λ€λ₯Έ μ΄λ¦μΌλ‘ μ μ₯... == SaveBaseContributor == λ² μ΄μ€ κΈ°μ¬μ μ μ§ λ° μ’ λ£ == SaveDstContributor == λμ κΈ°μ¬μ μ μ§ λ° μ’ λ£ == SaveSrcContributor == μμ€ κΈ°μ¬μ μ μ§ λ° μ’ λ£ == ExtraInfoButton == μ΄ λ³ν©μ λν μ 보 == ExtraInfoButtonTooltip == μ΄ λ³ν©μ λν μ 보λ₯Ό ν¨λμ νμ == Left == μΌμͺ½ == Right == μ€λ₯Έμͺ½ == SourceContributor == μμ€ κΈ°μ¬μ == DestinationContributor == λμ κΈ°μ¬μ == MovedCode == μ΄λν μ½λ μ‘°κ°. == ModifiedCode == μλ μμΉμ μμ λ μ½λ μ‘°κ°. == OriginalCode == μλ μ½λ μ‘°κ°. == ResultFile == κ²°κ³Ό νμΌ == AnnotateOptions == μ΅μ μ£Όμ λ¬κΈ° == Copy == λ³΅μ¬ == Cut == μλΌλ΄κΈ° == Paste == λΆμ¬λ£κΈ° == SelectAll == λͺ¨λ μ ν == FileTooLargeToDisplay == λ΄μ©μ νμνκΈ°μ νμΌμ΄ λ무 ν½λλ€. == BinMergeToolUnsupportedFileTypeForDiff == λ°μ΄λ리 λΉκ΅λ₯Ό μ§μνμ§ μλ νμΌμ λλ€. μ΄λ―Έμ§λ§ μ§μλ©λλ€